bitkeeper revision 1.1065 (40f2aec3dYgiVPACkpEwvEqCM-8iFg)
authormwilli2@equilibrium.research.intel-research.net <mwilli2@equilibrium.research.intel-research.net>
Mon, 12 Jul 2004 15:31:15 +0000 (15:31 +0000)
committermwilli2@equilibrium.research.intel-research.net <mwilli2@equilibrium.research.intel-research.net>
Mon, 12 Jul 2004 15:31:15 +0000 (15:31 +0000)
Change dmesg path.

tools/python/xen/xend/XendClient.py
tools/python/xen/xend/XendDmesg.py
tools/python/xen/xend/server/SrvNode.py
tools/python/xen/xend/server/SrvRoot.py

index 2c8027dd02576837602d131ae1a9ab5977fec0b4..534b163cc1cacbeeffdd6de576a685a9366fd2f4 100644 (file)
@@ -90,7 +90,7 @@ def eventurl(location, root, id=''):
     return urljoin(location, root, 'event/', id)
 
 def dmesgurl(location, root, id=''):
-    return urljoin(location, root, 'dmesg/', id)
+    return urljoin(location, root, 'node/dmesg/', id)
 
 def xend_request(url, method, data=None):
     """Make a request to xend.
index b344f50c0d65410d86c2669042fbacbe43ececb9..b4a5ca9cad0ad6374dc3717646d4f2c0a3247454 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
 
-"""Get dmesg output for this node.  Very basic right now!
+"""Get dmesg output for this node.
 """
 
 import os
index 0e8807d2b5c920ca0a57d7f355179a12f17850e3..fadd32309e90f404188833b67cd7d063978099fe 100644 (file)
@@ -13,6 +13,7 @@ class SrvNode(SrvDir):
     def __init__(self):
         SrvDir.__init__(self)
         self.xn = XendNode.instance()
+        self.add('dmesg', 'SrvDmesg')
 
     def op_shutdown(self, op, req):
         val = self.xn.shutdown()
@@ -48,11 +49,15 @@ class SrvNode(SrvDir):
             req.setHeader("Content-Type", sxp.mime_type)
             sxp.show(['node'] + self.info(), out=req)
         else:
+            url = req.prePathURL()
+            if not url.endswith('/'):
+                url += '/'
             req.write('<html><head></head><body>')
             self.print_path(req)
             req.write('<ul>')
             for d in self.info():
                 req.write('<li> %10s: %s' % (d[0], str(d[1])))
+            req.write('<li><a href="' +url + 'dmesg">Xen dmesg output</a>')
             req.write('</ul>')
             req.write('</body></html>')
         return ''
index 1211ff4bca0a3d630553870b6494c753ae218aeb..8d38937b727e235185a3ffea31d99bf52dc15b02 100644 (file)
@@ -15,7 +15,6 @@ class SrvRoot(SrvDir):
     subdirs = [
         ('node',    'SrvNode'       ),
         ('domain',  'SrvDomainDir'  ),
-        ('dmesg',   'SrvDmesg'      ),
         ('console', 'SrvConsoleDir' ),
         ('event',   'SrvEventDir'   ),
         ('device',  'SrvDeviceDir'  ),